Skip to content
This repository has been archived by the owner on Mar 13, 2024. It is now read-only.

[MM-29557] [MM-29590] Update subscription when purchase modal closes #6765

Merged
merged 2 commits into from
Oct 13, 2020
Merged

[MM-29557] [MM-29590] Update subscription when purchase modal closes #6765

merged 2 commits into from
Oct 13, 2020

Conversation

nickmisasi
Copy link
Contributor

Summary

There was a certain case where when you complete the purchase, the app would still show the various modals/banners around upgrading until refresh. This PR grabs the latest information on the subscription whenever the purchase modal closes, which will trigger re-renders of all downstream components depending on it (like the announcement banner, or information around the subscription in the system console)

Ticket Link

https://mattermost.atlassian.net/browse/MM-29557
https://mattermost.atlassian.net/browse/MM-29590

Related Pull Requests

N/A

Screenshots

N/A

@nickmisasi nickmisasi added 2: Dev Review Requires review by a core commiter 3: QA Review Requires review by a QA tester Setup Cloud Test Server Setup a test server using Mattermost Cloud labels Oct 13, 2020
@marianunez marianunez removed the 2: Dev Review Requires review by a core commiter label Oct 13, 2020
@nickmisasi nickmisasi removed the request for review from stevemudie October 13, 2020 20:10
@nickmisasi nickmisasi added 4: Reviews Complete All reviewers have approved the pull request and removed 3: QA Review Requires review by a QA tester Setup Cloud Test Server Setup a test server using Mattermost Cloud labels Oct 13, 2020
@nickmisasi nickmisasi self-assigned this Oct 13, 2020
@mm-cloud-bot
Copy link

Test server destroyed

@nickmisasi nickmisasi merged commit a0973be into master Oct 13, 2020
@nickmisasi nickmisasi deleted the MM-29557 branch October 13, 2020 20:10
@nickmisasi
Copy link
Contributor Author

/cherry-pick cloud-ga

@nickmisasi
Copy link
Contributor Author

Merging in order to get into cloud-ga branch - will test post-merge.

@nickmisasi
Copy link
Contributor Author

/cherry-pick cloud-ga

@mattermod
Copy link
Contributor

Cherry pick is scheduled.

@mattermod
Copy link
Contributor

mattermod commented Oct 13, 2020 •
edited by jira bot
Loading

Error trying doing the automated Cherry picking. Please do this manually

+++ Updating remotes...
Fetching upstream
Failed to add the RSA host key for IP address '140.82.113.4' to the list of known hosts (/app/.ssh/known_hosts).
From github.com:mattermost/mattermost-webapp
   994d1d529..a9f2d6c24  campaign/applytheme_sidebar-text -> upstream/campaign/applytheme_sidebar-text
   6e4398591..859d7cb71  cloud-ga   -> upstream/cloud-ga
   79737dac1..a0973be5e  master     -> upstream/master
Fetching origin
Failed to add the RSA host key for IP address '140.82.113.4' to the list of known hosts (/app/.ssh/known_hosts).
+++ Updating remotes done...
+++ Creating local branch automated-cherry-pick-of-mattermost-webapp-#6765-upstream-cloud-ga-1602620171
Switched to a new branch 'automated-cherry-pick-of-mattermost-webapp-#6765-upstream-cloud-ga-1602620171'
Branch 'automated-cherry-pick-of-mattermost-webapp-#6765-upstream-cloud-ga-1602620171' set up to track remote branch 'cloud-ga' from 'upstream'.

+++ About to attempt cherry pick of PR #6765 with merge commit a0973be5e3d287c524bd48fc318973a2ad155c9e.

error: could not apply a0973be5e... [MM-29557] [MM-29590] Update subscription when purchase modal closes (#6765)
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'

+++ Conflicts detected:

UU components/purchase_modal/index.ts
Aborting.

+++ Aborting in-progress git cherry-pick.

+++ Returning you to the master branch and cleaning up.

nickmisasi added a commit that referenced this pull request Oct 13, 2020
@nickmisasi
Cherry picking #6765
5ea49bc
@amyblais amyblais added Changelog/Not Needed Does not require a changelog entry Docs/Not Needed Does not require documentation labels Oct 13, 2020
Tak-Iwamoto pushed a commit to Tak-Iwamoto/mattermost-webapp that referenced this pull request Oct 14, 2020
Merge branch 'master' of github.com:Tak-Iwamoto/mattermost-webapp int…
cdc2288 
…o MM-20457

* 'master' of github.com:Tak-Iwamoto/mattermost-webapp: (87 commits)
  MM-T644 Integrations display on team where they were created (mattermost#6752)
  [MM-20478] Migrate post_header module to TypeScript (mattermost#6631)
  [MM-20599] Migrated select_team component to Typescript (mattermost#6574)
  MM-20554 Migrate 'components/delete_post_modal' module and associated tests to TypeScript (mattermost#6656)
  [MM-24436]- Add a threshold from bottom for new messages toast (mattermost#5828)
  [MM-20489] Migrate failed_post_options and its tests to typescript (mattermost#6717)
  [MM-28063] Cloud Telemetry - Admin Console (mattermost#6762)
  [MM-29559][MM-29558] Company Info Fixes (mattermost#6764)
  [MM-29557] [MM-29590] Update subscription when purchase modal closes (mattermost#6765)
  [MM-29615] Fixed subscription page so it doesn't load until subscription info is loaded (mattermost#6766)
  [MM-28064] Add telemetry in various places around cloud message banners (mattermost#6763)
  migrate changeCSS function CSS variable for mobile CSS .tutorial-steps__container selector. (mattermost#6743)
  [MM-27231]: cypress test for MM-T1837 (mattermost#6676)
  [MM-28062] Add telemetry for in-app purchase flow (mattermost#6760)
  MM-27454 - Contact Us and Billing Documentation Links (mattermost#6731)
  [MM-20514] Migrates components/password reset send link to typescript (mattermost#6584)
  Cloud Billing polish Soft GA (mattermost#6740)
  [MM-28221] Payment Info Edit/View (mattermost#6709)
  MM-T636 Description field for incoming and outgoing webhooks can hold 500 characters (mattermost#6682)
  Translations update from Weblate (mattermost#6748)
  ...
jfrerich pushed a commit that referenced this pull request Oct 23, 2020
@nickmisasi @jfrerich
[MM-29557] [MM-29590] Update subscription when purchase modal closes (#…
4477663 
…6765)

* Trigger getCloudSubscription after closing modal to update banners throughout webapp

* Fix types
calebroseland pushed a commit that referenced this pull request Oct 27, 2020
@nickmisasi @calebroseland
[MM-29557] [MM-29590] Update subscription when purchase modal closes (#…
61a7ed3 
…6765)

* Trigger getCloudSubscription after closing modal to update banners throughout webapp

* Fix types
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@alifarooq0 alifarooq0 alifarooq0 approved these changes

@devinbinnie devinbinnie devinbinnie approved these changes

Assignees

@nickmisasi nickmisasi

Labels
4: Reviews Complete All reviewers have approved the pull request Changelog/Not Needed Does not require a changelog entry Docs/Not Needed Does not require documentation
Projects
None yet
Milestone
No milestone
7 participants
@nickmisasi @mm-cloud-bot @mattermod @alifarooq0 @devinbinnie @marianunez @amyblais